From 2be0ce7c28b1501a8ee992a21081541b3f294383 Mon Sep 17 00:00:00 2001
From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
Date: Mon, 27 Sep 2021 13:09:18 -0600
Subject: [PATCH] fixes for #722, Mechanically remove QStringRef use for
 QStringView to help with Qt6. (#723)

* Fix typo in maggeo from search-and-replace work earlier.

* Revert startOfDate() calls to keep floor at 5.12.x to keep builders happy. :-/

* Explictly get QString from StringView in gpx for compat with older Qt builds.

Co-authored-by: Robert Lipe <robertlipe@gmail.com>
---
 gpx.cc    | 2 +-
 maggeo.cc | 2 +-
 xcsv.cc   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gpx.cc b/gpx.cc
index 3f9e78494..d587c83ee 100644
--- a/gpx.cc
+++ b/gpx.cc
@@ -894,7 +894,7 @@ void
 GpxFormat::gpx_cdata(const QStringView& s)
 {
   QString* cdata;
-  cdatastr += s;
+  cdatastr += s.toString();
 
   if (!cur_tag) {
     return;
diff --git a/maggeo.cc b/maggeo.cc
index fd3c1f16c..004dc9964 100644
--- a/maggeo.cc
+++ b/maggeo.cc
@@ -194,7 +194,7 @@ static QDateTime maggeo_parsedate(char* dmy)
   int d = date.midRef(0,2).toInt();
   int m = date.midRef(2,2).toInt();
   int y = date.midRef(4,3).toInt();
-  QDateTime r(QDate(y + 1900, m, d)::startOfDay());
+  QDateTime r(QDate(y + 1900, m, d));
   return r;
 }
 
diff --git a/xcsv.cc b/xcsv.cc
index e6ea0397f..7e5a6009d 100644
--- a/xcsv.cc
+++ b/xcsv.cc
@@ -258,7 +258,7 @@ QDateTime
 XcsvFormat::yyyymmdd_to_time(const char* s)
 {
   QDate d = QDate::fromString(s, "yyyyMMdd");
-  return QDateTime(d.startOfDay());
+  return QDateTime(d);
 }
 
 
-- 
2.30.2